bitkeeper revision 1.1327.1.9 (42714a2f9RKgJOZHHOz9jvIICLyXxQ)

More code cleanup

diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
index b8f1fdf161127a2e1b32153d06301adace41e257..6bc52ee152af5f4ae46b7c9ec41c77123ef62137 100644 (file)
--- a/xen/arch/ia64/Makefile
+++ b/xen/arch/ia64/Makefile
@@ -9,7 +9,7 @@ OBJS = xensetup.o setup.o time.o irq.o ia64_ksyms.o process.o smp.o \
        sal.o cmdline.o mm_init.o tlb.o smpboot.o \
        extable.o linuxextable.o \
        regionreg.o entry.o unaligned.o privop.o vcpu.o \
-       irq_ia64.o irq_lsapic.o hpsim_irq.o vhpt.o xenasm.o dom_fw.o
+       irq_ia64.o irq_lsapic.o vhpt.o xenasm.o dom_fw.o
 # perfmon.o
 # unwind.o needed for kernel unwinding (rare)
 

diff --git a/xen/arch/ia64/patch/linux-2.6.11/cpumask.h b/xen/arch/ia64/patch/linux-2.6.11/cpumask.h
index 6022ea2cdf49253ac5a51d5b32866ce5defeb8c4..c5866b53508ecc2aad54db010cf64efd116b5530 100644 (file)
--- a/xen/arch/ia64/patch/linux-2.6.11/cpumask.h
+++ b/xen/arch/ia64/patch/linux-2.6.11/cpumask.h
@@ -1,20 +1,12 @@
- cpumask.h |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.11-xendiffs/include/linux/cpumask.h
-===================================================================
---- linux-2.6.11-xendiffs.orig/include/linux/cpumask.h 2005-03-02 01:38:00.000000000 -0600
-+++ linux-2.6.11-xendiffs/include/linux/cpumask.h      2005-03-24 15:06:18.408145243 -0600
-@@ -341,11 +341,11 @@ static inline int __cpumask_parse(const 
-  *        main(){ set1(3); set2(5); }
+--- ../../linux-2.6.11/include/linux/cpumask.h 2005-03-02 00:38:00.000000000 -0700
++++ include/asm-ia64/linux/cpumask.h   2005-04-28 13:21:20.000000000 -0600
+@@ -342,7 +342,9 @@
   */
  
-+#if NR_CPUS > 1
  extern cpumask_t cpu_possible_map;
++#ifndef XEN
  extern cpumask_t cpu_online_map;
++#endif
  extern cpumask_t cpu_present_map;
  
--#if NR_CPUS > 1
- #define num_online_cpus()     cpus_weight(cpu_online_map)
- #define num_possible_cpus()   cpus_weight(cpu_possible_map)
- #define num_present_cpus()    cpus_weight(cpu_present_map)
+ #if NR_CPUS > 1

diff --git a/xen/arch/ia64/patch/linux-2.6.11/time.c b/xen/arch/ia64/patch/linux-2.6.11/time.c
index e109c76fe6aee9b6aa238a507885a283f155949c..8df14e4311bce55b4ced1e4fc53052dca18e6908 100644 (file)
--- a/xen/arch/ia64/patch/linux-2.6.11/time.c
+++ b/xen/arch/ia64/patch/linux-2.6.11/time.c
@@ -1,5 +1,5 @@
 --- ../../linux-2.6.11/arch/ia64/kernel/time.c 2005-03-02 00:37:50.000000000 -0700
-+++ arch/ia64/time.c   2005-04-26 15:43:01.000000000 -0600
++++ arch/ia64/time.c   2005-04-28 14:29:58.000000000 -0600
 @@ -10,16 +10,22 @@
   */
  #include <linux/config.h>
@@ -49,7 +49,7 @@
  
 +#ifdef XEN
 +volatile unsigned long last_nsec_offset;
-+extern rwlock_t xtime_lock;
++extern seqlock_t xtime_lock;
 +unsigned long cpu_khz;  /* Detected as we calibrate the TSC */
 +static s_time_t        stime_irq;       /* System time at last 'time update' */
 +

diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
index 6ff9b80a95875c0e291f6c267c794debfece8dd0..624142966f600745001f661482c264c573423b4a 100644 (file)
--- a/xen/arch/ia64/tools/mkbuildtree
+++ b/xen/arch/ia64/tools/mkbuildtree
@@ -103,7 +103,7 @@ softlink kernel/extable.c arch/ia64/linuxextable.c
 cp_patch arch/ia64/mm/contig.c arch/ia64/mm_contig.c mm_contig.c
 cp_patch arch/ia64/mm/tlb.c arch/ia64/tlb.c tlb.c
 
-cp_patch arch/ia64/hp/sim/hpsim_irq.c arch/ia64/hpsim_irq.c hpsim_irq.c
+#cp_patch arch/ia64/hp/sim/hpsim_irq.c arch/ia64/hpsim_irq.c hpsim_irq.c
 
 softlink arch/ia64/kernel/efi_stub.S arch/ia64/efi_stub.S
 softlink arch/ia64/kernel/entry.h arch/ia64/entry.h
@@ -178,7 +178,8 @@ cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h
 softlink include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h
 #cp_patch include/asm-ia64/ide.h include/asm-ia64/ide.h ide.h
 cp_patch include/asm-ia64/io.h include/asm-ia64/io.h io.h
-cp_patch include/asm-ia64/irq.h include/asm-ia64/irq.h irq.h
+#cp_patch include/asm-ia64/irq.h include/asm-ia64/irq.h irq.h
+softlink include/asm-ia64/irq.h include/asm-ia64/irq.h
 cp_patch include/asm-ia64/kregs.h include/asm-ia64/kregs.h kregs.h
 cp_patch include/asm-ia64/page.h include/asm-ia64/page.h page.h
 cp_patch include/asm-ia64/processor.h include/asm-ia64/processor.h processor.h
@@ -266,10 +267,12 @@ cp_patch include/linux/cpumask.h include/asm-ia64/linux/cpumask.h cpumask.h
 softlink include/linux/dma-mapping.h include/asm-ia64/linux/dma-mapping.h
 #cp_patch include/linux/efi.h include/asm-ia64/linux/efi.h efi.h
 softlink include/linux/efi.h include/asm-ia64/linux/efi.h
-cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h linuxhardirq.h
+#cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h linuxhardirq.h
+softlink include/linux/hardirq.h include/asm-ia64/linux/linuxhardirq.h
 #cp_patch include/linux/init_task.h include/asm-ia64/linux/init_task.h init_task.h
 cp_patch include/linux/interrupt.h include/asm-ia64/linux/interrupt.h interrupt.h
-cp_patch include/linux/mmzone.h include/asm-ia64/linux/mmzone.h mmzone.h
+#cp_patch include/linux/mmzone.h include/asm-ia64/linux/mmzone.h mmzone.h
+softlink include/linux/mmzone.h include/asm-ia64/linux/mmzone.h
 
 #cp_patch include/linux/wait.h include/asm-ia64/linux/wait.h wait.h
 softlink include/linux/wait.h include/asm-ia64/linux/wait.h
@@ -277,7 +280,8 @@ softlink include/linux/wait.h include/asm-ia64/linux/wait.h
 #cp_patch include/linux/slab.h include/asm-ia64/slab.h slab.h
 
 # following renamed to avoid conflict
-cp_patch include/linux/time.h include/xen/linuxtime.h linuxtime.h
+#cp_patch include/linux/time.h include/xen/linuxtime.h linuxtime.h
+softlink include/linux/time.h include/asm-ia64/linux/linuxtime.h
 
 softlink include/linux/bcd.h include/asm-ia64/linux/bcd.h
 softlink include/linux/bitmap.h include/asm-ia64/linux/bitmap.h
@@ -301,6 +305,7 @@ softlink include/linux/threads.h include/asm-ia64/linux/threads.h
 softlink include/linux/timex.h include/asm-ia64/linux/timex.h
 softlink include/linux/topology.h include/asm-ia64/linux/topology.h
 softlink include/linux/tty.h include/asm-ia64/linux/tty.h
+softlink include/linux/seqlock.h include/asm-ia64/linux/seqlock.h
 
 null include/asm-ia64/linux/file.h
 null include/asm-ia64/linux/module.h
@@ -309,6 +314,7 @@ null include/asm-ia64/linux/device.h
 null include/asm-ia64/linux/proc_fs.h
 null include/asm-ia64/linux/rtc.h
 null include/asm-ia64/linux/profile.h
+null include/asm-ia64/linux/seqlock.h
 
 softlink include/linux/byteorder/generic.h include/asm-ia64/linux/byteorder/generic.h
 softlink include/linux/byteorder/little_endian.h include/asm-ia64/linux/byteorder/little_endian.h

diff --git a/xen/arch/ia64/xenmisc.c b/xen/arch/ia64/xenmisc.c
index 16668ed49d9777f9d9b03a91170a01a93fc673b5..eb8e810491606e65a369c2f758c3e5137640d9d3 100644 (file)
--- a/xen/arch/ia64/xenmisc.c
+++ b/xen/arch/ia64/xenmisc.c
@@ -259,6 +259,12 @@ void sys_exit(void)
 }
 
 
+////////////////////////////////////
+// called from irq_ia64.c:init_IRQ()
+//   (because CONFIG_IA64_HP_SIM is specified)
+////////////////////////////////////
+void hpsim_irq_init(void) { }
+
 
 // accomodate linux extable.c
 //const struct exception_table_entry *

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index 1c34f409991c820febaa4025e13644caea046058..c590f314238afef1661f2e2108859db7292800ed 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -136,6 +136,7 @@ struct page;
 #define __cacheline_aligned
 #define ____cacheline_aligned
 #define ____cacheline_aligned_in_smp
+#define ____cacheline_maxaligned_in_smp
 
 #include "asm/types.h" // for u64
 struct device {
@@ -222,21 +223,27 @@ void sort_main_extable(void);
 // FIXME following needs work
 #define atomic_compareandswap(old, new, v) old
 
-// x86 typedef still used in sched.h, may go away later
-//typedef unsigned long l1_pgentry_t;
-
 // see include/asm-ia64/mm.h, handle remaining pfn_info uses until gone
 #define pfn_info page
 
 // see common/keyhandler.c
 #define        nop()   asm volatile ("nop 0")
 
-#define ARCH_HAS_EXEC_DOMAIN_MM_PTR
-
 // from include/linux/preempt.h (needs including from interrupt.h or smp.h)
 #define preempt_enable()       do { } while (0)
 #define preempt_disable()      do { } while (0)
 
+// needed for include/xen/linuxtime.h
+typedef s64 time_t;
+typedef s64 suseconds_t;
+
+// used in common code
+#define softirq_pending(cpu)   (cpu_data(cpu)->softirq_pending)
+
+// dup'ed from signal.h to avoid changes to includes
+#define        SA_SHIRQ        0x04000000
+#define        SA_INTERRUPT    0x20000000
+
 // these declarations got moved at some point, find a better place for them
 extern int opt_noht;
 extern int ht_per_core;